From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 6 Aug 2011 15:03:25 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~812^2~65
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=3019ceda0d720be62102bd76d52cfcab67ac012a;p=emacs.git

Merge from trunk.
---

3019ceda0d720be62102bd76d52cfcab67ac012a